From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Wed, 25 Oct 2006 18:12:01 +0000 (-0600)
Subject: merge with xen-unstable.hg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15584
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=506aac287c966885eb13db465da3d05fdceceeaf;p=xen.git

merge with xen-unstable.hg
---

506aac287c966885eb13db465da3d05fdceceeaf
diff --cc unmodified_drivers/linux-2.6/platform-pci/Kbuild
index dda3d0e7cf,5cd0a348ad..a44e50e94c
--- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild
+++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild
@@@ -4,9 -4,4 +4,9 @@@ obj-m := xen-platform-pci.
  
  EXTRA_CFLAGS += -I$(M)/platform-pci
  
- xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o features.o
+ xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o features.o platform-compat.o
 +
 +# Can we do better ?
 +ifeq ($(ARCH),ia64)
 +  xen-platform-pci-objs += xcom_mini.o xencomm.o
 +endif
diff --cc unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index cb9e8dd7e5,9e7fc58ebf..5ff6ba83f7
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@@ -33,11 -33,9 +33,12 @@@
  #include <asm/irq.h>
  #include <asm/uaccess.h>
  #include <asm/hypervisor.h>
+ #include <asm/pgtable.h>
  #include <xen/interface/memory.h>
  #include <xen/features.h>
 +#ifdef __ia64__
 +#include <asm/xen/xencomm.h>
 +#endif
  
  #include "platform-pci.h"